Merge branch 'develop' into documentation/JAL-2418_release2102
authorJim Procter <jprocter@issues.jalview.org>
Wed, 31 May 2017 20:05:39 +0000 (21:05 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 31 May 2017 20:05:39 +0000 (21:05 +0100)

Trivial merge