trying again with JDK 7u40 requirement on OS X
Merge branch 'master' of github.com:processing/processing