Merge pull request #408 from jeffwilcox/dev

AzureEdition parameter added