wtf
scripted update of code from master at d8be7e9 wtf