Merge branch 'JAL-1569_wuss_vienna_broke' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Sun, 23 Nov 2014 20:10:19 +0000 (20:10 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Sun, 23 Nov 2014 20:10:19 +0000 (20:10 +0000)

Trivial merge