maybe this...
scripted update of code from master at e9c2aab maybe this...