Merge PuppetSSH branch with master