merge conflict changed
Merge branch 'dev' of https://github.com/leacoco/ops-puppet into dev