Update
Update
Update
Update
Merge branch 'dev'

Conflicts:
	src/build/modules/supervisor/manifests/init.pp