heh
scripted update of code from master at 260e1d4 heh