Merge branch 'jims_crlf_hell_JAL-1551' of https://source.jalview.org/git/jalview...