Merge pull request #210 from Esri/develop

June Release

Merge pull request #167 from Esri/develop

Feb_2016

Merge branch 'develop'

Merge pull request #131 from Esri/develop

Develop

Merge branch 'develop'

Merge branch 'develop'