Merge branch 'develop' into documentation/JAL-2418_release2102
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 May 2017 15:26:52 +0000 (16:26 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 May 2017 15:26:52 +0000 (16:26 +0100)

Trivial merge