Merge pull request #6415 from stokito/acme