v1.30.0: Merge branch 'master' into json
Pre-release
Pre-release
# Conflicts: # csharp/templates/XenServer.csproj.mustache # powershell/common_functions.ml
# Conflicts: # csharp/templates/XenServer.csproj.mustache # powershell/common_functions.ml