Upgraded for Ansible 1.3.3