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