Merge branch 'features/JAL-2316' into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 9 Feb 2017 12:49:33 +0000 (12:49 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 9 Feb 2017 12:49:33 +0000 (12:49 +0000)

Trivial merge