hopefully
scripted update of code from master at 868d4f0 hopefully