lint
Merge pull request #14754 from thatch45/2014.7

lint