weurd
scripted update of code from master at ae2c2c9 weurd