Merged master into 0.1.x branch
Merge branch '0.1.x' of github.com:cyberious/puppetlabs-reboot into 0.1.x