Now handles modes=4 correctly (i.e. at all)
Merge remote-tracking branch 'origin/master' into update-iris-correspondence