Merge pull request #3462 from martin-frbg/azure-alpine2