Merge pull request #1084 from brooksryba/develop

Develop