Merge branch 'bug/JAL-2283consColourEnabled' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 12:34:54 +0000 (13:34 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 24 Oct 2016 12:34:54 +0000 (13:34 +0100)

Trivial merge