Merge branch 'develop' into trial_merge/JAL-1950
authorJim Procter <jprocter@issues.jalview.org>
Fri, 15 Sep 2017 10:43:20 +0000 (11:43 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 15 Sep 2017 10:43:20 +0000 (11:43 +0100)

Trivial merge