Merge branch 'integral' of ssh://repo.or.cz/srv/git/trakem2 into integral