Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 19 Sep 2016 13:17:22 +0000 (14:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 19 Sep 2016 13:17:22 +0000 (14:17 +0100)

Trivial merge