Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 12 Aug 2018 11:37:05 +0000 (06:37 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 12 Aug 2018 11:37:05 +0000 (06:37 -0500)

Trivial merge