Merge branch 'bugfix/JAL-1239' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:15:35 +0000 (15:15 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:15:35 +0000 (15:15 +0100)

Trivial merge