Merge pull request #760 from RichmondDay/master

merging some release branch changes to development from master