Merging azure-master with master for deployment