commenting strict
scripted update of code from master at 99c4bc2 commenting strict