Merge branch 'master' into issue-nwbib-17-spatial-99

Conflicts:
	lodmill-rd/src/test/resources/hbz01.nt