Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/protected/runtime/application.log