Merge remote-tracking branch 'origin/master' into gwt-2.6.0