Merge branch 'JAL-1322' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 22:15:33 +0000 (23:15 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 22:15:33 +0000 (23:15 +0100)

Trivial merge