ansible/ansible — pull request #8017 by Jmainguy (2014-07-02 16:53:04+00:00)
Title: Fixed merge conflicts, and doing a new pull request because I messed up ...

...#6607