Merge branch 'releases/Release_2_10_4_Branch' of http://source.jalview.org/git/jalvie...