Merge 0.9->0.10 again