Merge branch 'fix-event-loop' into qt4

Conflicts:
	src/browser.cc