sigh
scripted update of code from master at 9603307 sigh