1
Merge remote-tracking branch 'origin/master'

Conflicts:
	build-QtCppSample/Makefile.Debug
	build-QtCppSample/Makefile.Release