Merge remote-tracking branch 'eclipse/master' into master_testing