Merging 0.9.x into 0.10.x