METAMODEL-76: Fixed.
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-metamodel.git

Conflicts:
	CHANGES.txt