Merged ansible branch into master
18 files changed