bug fixes
Merge branch 'microsoft-azure' of https://github.com/robpointmarc/pointmarc-public into microsoft-azure