Lint cleanup (toLowerCase().equals(), unused protected fields).
Merge branch 'master' into soleger-master
Final modifier cleanup on public static fields.
Merge branch 'master' into soleger-master
Merge branch 'soleger-master'