Merge branch 'devel' of github.com:ansible/ansible into devel
Merge branch 'devel' of github.com:gregorg/ansible into devel