Changelog for 0.9.5
Merge branch 'master' into 96x