Need to check if path has been previously defined.
Merge branch 'master' into pull_here

Conflicts:
	manifests/repo.pp