Merge branch 'kjvdh/features/testing' into spikes/koen
authorJim Procter <jprocter@issues.jalview.org>
Mon, 18 Dec 2017 05:36:34 +0000 (18:36 +1300)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 18 Dec 2017 05:36:34 +0000 (18:36 +1300)

Trivial merge