Merge origin/master

Conflicts:
	protected/runtime/application.log