Fixes issues #1805 and #1806
Merge branch 'master' of https://github.com/processing/processing.git