migrating to sebastian's fixed librarian-puppet scripts
Merge branch 'master' into develop

Conflicts:
	shell/update-ruby.sh