all was well (after tests)
Merge remote-tracking branch 'origin/master' into megge