.
Merge branch 'master' of https://github.com/ms123s/global-metadata

Conflicts:
	stencilsets/camel.json
.Merge branch 'master' of https://github.com/ms123s/global-metadata

Conflicts:
	stencilsets/camel.json
.