Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 13:34:17 +0000 (13:34 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 13:34:17 +0000 (13:34 +0000)

Trivial merge