merge javins/puppet-reviewboard master @ a0223326878aea46eb1b9f77e422319301e19760