Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 16 Nov 2016 16:10:15 +0000 (16:10 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 16 Nov 2016 16:10:15 +0000 (16:10 +0000)

Trivial merge