Merge branch 'features/JAL-1333' into develop
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:21:49 +0000 (20:21 +0100)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:21:49 +0000 (20:21 +0100)

Trivial merge