FindBugs fixes; bump version
Sync with Nuthatch; bump version