wtf strict
scripted update of code from master at 463425c wtf strict