Merge pull request #1071 from brooksryba/develop

Develop