Merge branch 'master' of git.auf:ansible