Merge branch 'develop' of http://source.jalview.org/git/jalview into develop