Merge remote-tracking branch 'upstream/jdk7u-dev'