https://redmine.purplemotion.com/issues/1429 - release preparation - refs #1429
Merge branch 'release/0.9.5' into develop