Updating to the latest version of puppet module
Merge branch '1.1.x'