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