Master version
Merge branch 'master' into rel03

Conflicts:
	VERSION