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

Conflicts:
	src/quick/doc/src/appdevguide/porting.qdoc
	sync.profile

Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12

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

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

diff --cc src/quick/scenegraph/coreapi/qsgnode.cpp
Simple merge

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