Merge branch 'jims/291patches' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 14:18:36 +0000 (15:18 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 14:18:36 +0000 (15:18 +0100)

Trivial merge