Merge pull request #2413 from bentley/optypo