Merge branch 'JAL-1340_redundancy' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 29 Apr 2014 12:25:46 +0000 (13:25 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 29 Apr 2014 12:25:46 +0000 (13:25 +0100)

Trivial merge