Merge branch 'bug/JAL-2277_html-output-wrapped-mode' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Oct 2016 10:26:33 +0000 (11:26 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Oct 2016 10:26:33 +0000 (11:26 +0100)

Trivial merge