Merge branch 'bugs/JAL-1151' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 7 Oct 2014 16:27:55 +0000 (17:27 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 7 Oct 2014 16:27:55 +0000 (17:27 +0100)

Trivial merge