Merge branch 'feature/JAL-1379' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Jun 2014 08:10:38 +0000 (09:10 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 12 Jun 2014 08:10:38 +0000 (09:10 +0100)

Trivial merge