working but hacked around - fix
Merge remote-tracking branch 'upstream-good/master'