Processing 2.1
Merge pull request #1439 from timsutton/processing-2.1

Processing 2.1