Merge branch 'master' into develop
Merge pull request #32 from Esri/develop

Merge branch 'master' into develop