Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 23:42:21 +0000 (17:42 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 23:42:21 +0000 (17:42 -0600)

Trivial merge