Merge commit 'e51352ce1b080dcacc3945de64dc0b34c7e9ffef'

Conflicts:
	code/core/browser.cpp