Merge branch 'ict' of ssh://saalfeld@repo.or.cz/srv/git/trakem2 into ict