manually folding in other pull request (which came after some files had
already been modified)