gahhh
scripted update of code from master at 59f1e05 gahhh