Merge branch 'patch/JAL-1286_JAL-1265' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:18:49 +0000 (16:18 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:18:49 +0000 (16:18 +0100)

Trivial merge