Merge branch 'JalScape/JAL-1332' of https://source.jalview.org/git/jalview into JalSc...