Typos
Merge branch 'master' into production

Conflicts:
	Puppetfile