Merge 0.9-devel to 0.10-devel

Bring the head of 0.9-devel into 0.10-devel.