Merge remote-tracking branch 'origin/master' into debug
Merge pull request #22 from fiji/debug

Merge remote-tracking branch 'origin/master' into debug