Merge branch 'forpush/JAL-674_dssp' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 16:36:34 +0000 (17:36 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 16:36:34 +0000 (17:36 +0100)

Trivial merge