Merge branch 'JDK7_OSX'
Merge branch 'master' into JDK7_OSX