merge1
Merge branch 'simple-NH11'

Conflicts:
	nextRelease.txt