Merge pull request #1114 from brooksryba/develop

Develop