Merge 0.36-stable into master

Merge the 0.36-stable branch on to master.