synchronizing with master

Eclipse didn't 'refresh' properly so the merge is registering as a
commit