Merge pull request #1 from ansible/devel

Rebase on Ansible proper