test 2
test 2
Merge commit '24ccc627dbeabdbbef125f6f390bde71245cb913'

Conflicts:
	nextRelease.txt
Merge branch 'simple-NH'

* simple-NH:
  test 2