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