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