Merge pull request #1103 from brucehoff/develop

Develop