Merge pull request #760 from RichmondDay/master

merging some release branch changes to development from master
Merge pull request #761 from RichmondDay/development

Merge pull request #760 from RichmondDay/master