not sure wtf happend
scripted update of code from master at ecd0dd8 not sure wtf happend