Merge pull request microsoft#593 from microsoft/staging

Sync master <-> staging

Merge pull request microsoft#526 from microsoft/staging

Syncing master <-> staging

Merge branch 'master' of https://github.com/microsoft/ComputerVision