so much stupid
scripted update of code from master at 28820cf so much stupid