Merge remote-tracking branch 'eclipse/1.3_maintenance'