Merge origin/master

Conflicts:
	module/Application/Module.php