Merge branch 'JAL-1397' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 12 May 2014 15:06:11 +0000 (16:06 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 12 May 2014 15:06:11 +0000 (16:06 +0100)

Trivial merge