Only use the src and test folders in Eclipse
Merge remote-tracking branch 'origin/master' into upgrade
Merge in some Eclipse changes from master