Merge https://github.com/ansible/ansible/pull/5518