- Merge branch 'master' into pubCloudSMT
  + pull changes from upstream, base version update to 2.0.3

Conflicts:
	Makefile