Fixes #2531
Merge branch 'master' of https://github.com/processing/processing