Merge branch 'features/JAL-1333' into develop
authorj.procter@dundee.ac.uk <jprocter@lifesci-14319.dyn.lifesci.dundee.ac.uk>
Tue, 22 Jul 2014 20:09:45 +0000 (21:09 +0100)
committerj.procter@dundee.ac.uk <jprocter@lifesci-14319.dyn.lifesci.dundee.ac.uk>
Tue, 22 Jul 2014 20:09:45 +0000 (21:09 +0100)

Trivial merge