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

Trivial merge