Bump version

Change-Id: I509b98fb944d007cc1e2727e5b6fa8661767c1a6
Fix a typo in proxy handling.

Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23
Task-number: QTBUG-39568
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2