Merge branch 'optimisation/JAL-2001' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 4 Apr 2016 15:15:07 +0000 (16:15 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 4 Apr 2016 15:15:07 +0000 (16:15 +0100)

Trivial merge