2nd attempt at fixing #2926
Merge branch 'master' of https://github.com/processing/processing