x
Merge branch 'new_branch_name'

Conflicts:
	manifests/init.pp