Merge branch '5.4' into phantomjs

Conflicts:
	Source/WebKit/qt/Api/qwebsettings.cpp
	Source/WebKit/qt/Api/qwebsettings.h

Change-Id: I89e5b0541bc559352c2e0ad8d652cd447a3c40eb