Merge development for 0.9 release into master as stable