Merge branch 'master' of git://git.puppet.immerda.ch/module-common