add Gnorm's bugfixes
Merge branch 'master' into release-09-gnorm