ugh
scripted update of code from master at 63686b4 ugh