Findbugs updates
Merge origin/master
Merge origin/master