Merge branch 'hotfix/JAL-1524'
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Jun 2014 10:41:48 +0000 (11:41 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Jun 2014 10:41:48 +0000 (11:41 +0100)

Trivial merge