Added changes from David Foerster's automatically generated script. Ref.: