Ported lint cleanup from mrlambeth-master into master.
Merge branch 'master' into mrlambeth-master