madness!
scripted update of code from master at 5694fc1 madness!