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

Trivial merge