wtf
scripted update of code from master at c021b90 wtf