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