syntax
scripted update of code from master at 6b57fb0 syntax