lint fix
Merge pull request #14489 from thatch45/2014.7

lint fix