Two minor corrections
Merge remote-tracking branch 'origin/manfred' into development