master
Changes to eliminate warnings in latest Java/Eclipse