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

Change-Id: Id075e7cf92b8cfe699f81859c4b1174c045757cd
Bump qtwebkit-examples version to 5.3.0

Change-Id: I77e3879dd545d99db46665537008377677f7d131
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: Ib1ccb9d61eee5fc4d007eb19298d4a95ee821b51
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ife43dad6efd6fdb78e030b14a276ba70488312bd
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: Id379003446bebe11e3d3fe7864d7b48e65bf1890