Fix for last commit
Merge branch 'master' into for_puppet