Merge pull request #142 from adam-p/development

v2.9.4 release
Merge branch 'master', remote-tracking branch 'origin' into development