Merge branch 'develop' into Jalview-JS/develop