Changes needed for Ansible v1.4.4