Merge remote-tracking branch 'origin/release' into stable

Conflicts:
	src/qml/qml/qqmlcompiler.cpp

Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1

diff --cc src/qml/jsruntime/qv4jsonobject.cpp
Simple merge

diff --cc src/qml/qml/qqmlcompiler.cpp
index 1e5f6bf,1872748..2e208f2
--- 1/src/qml/qml/qqmlcompiler.cpp
--- 2/src/qml/qml/qqmlcompiler.cpp
+++ b/src/qml/qml/qqmlcompiler.cpp
@@@ -61,7 -61,8 +61,7 @@@
  #include "qqmlscriptstring.h"
  #include "qqmlglobal_p.h"
  #include "qqmlbinding_p.h"
- #include "qqmlabstracturlinterceptor_p.h"
+ #include "qqmlabstracturlinterceptor.h"
 -#include "qqmlcodegenerator_p.h"
  
  #include <QDebug>
  #include <QPointF>

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge

diff --cc src/qml/qml/qqmltypeloader.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgthreadedrenderloop.cpp
Simple merge

diff --cc src/quick/util/qquickpixmapcache.cpp
Simple merge