typos
reverted BEAM-1680
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into nestmod

Conflicts:
	pom.xml