Merge remote-tracking branch 'upstream/master'

Conflicts:
	Modulefile
	manifests/apache/vhost.pp
	manifests/init.pp