Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git