master
Changes for latest Java/Eclipse