merge ScottWales/puppet-reviewboard 'beaker' branch @ fdfcfe3c5e5f23f4556436808ba8f45ef4ab85f4