ok
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	DATABASE/COMMON/METADATA/Object/CreateObjectDescFunction.sql