Java 7u60 release
Merge remote-tracking branch 'upstream/master'