bbondy merged 1 commit into master from cpp-lint-compliance Feb 27, 2019