Merge branch 'master' of http://source.jalview.org/git/cc-branches