Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
authorJim Procter <jprocter@issues.jalview.org>
Tue, 2 Aug 2016 13:16:06 +0000 (14:16 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 2 Aug 2016 13:16:06 +0000 (14:16 +0100)

Trivial merge