Merge branch 0.9-stable into master.