6408447 Merge branch 'master' of /git/ansible

Merged and Committed by codeblock 9 years ago
    Merge branch 'master' of /git/ansible