prettyness
Merge branch 'stage_boss' of github.com:haraldsk/puppet-testing into stage_boss