Merge rewrite branch, prepare for 0.9 release