Brought up to date with current state on cosy.
Merge branch 'master' of https://github.com/CamLib/puppet3