Merge branch 'JAL-1569_wuss_vienna_broke' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 24 Nov 2014 22:17:25 +0000 (22:17 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 24 Nov 2014 22:17:25 +0000 (22:17 +0000)

Trivial merge