more dependency fixing
scripted update of code from master at 290ff94 more dependency fixing