Fixes #2346
Merge branch 'fix-module-encoding' of git://github.com/andreparames/ansible into devel