GA Release
Merge branch 'WinterDbRelease'

Conflicts:
	template.gnomerc