lint fix
Merge pull request #14828 from thatch45/2014.7

lint fix