<<<<<<< HEAD 20180821132825 ======= 20180821131949 >>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git