wtfwtff
scripted update of code from master at e6c977a wtfwtff