Merge branch 'master' into mydevelop2

Conflicts:
	geoportal/etc/Metadata/README.txt