Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop