Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 30 Oct 2018 08:40:13 +0000 (03:40 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 30 Oct 2018 08:40:13 +0000 (03:40 -0500)

Trivial merge