upgrade puppet
Merge branch 'Dev' into staging
Merge branch 'staging'