Merge branch 'devel' of https://github.com/gregbuehler/ansible into devel