Merge pull request #2885 from benthecarman/tiny-opt