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

Trivial merge