Merge pull request #46 from Windower/4.1

4.1 Sync
4.1 azuresets update
Merge pull request #406 from nitrous24/4.1

4.1 azuresets update