FindBugs sweep.
Merge pull request #512 from square/adriancole_02_05_findbugs

FindBugs sweep.