Merge branch 'Jalview-BH/JAL-3026' of http://source.jalview.org/git/jalview into...