captureImage doesn't like being on the EDT either... [1303]
Merge remote-tracking branch 'upstream/master'