try to get build working under Eclipse 4.3M7
Merge remote-tracking branch 'upstream/development' into development