Merge branch 'Jalview-JS/develop' into Jalview-JS/develop_with_gradle_build