Merge branch 'JAL-1602_282_release' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 2 Dec 2014 11:43:22 +0000 (11:43 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 2 Dec 2014 11:43:22 +0000 (11:43 +0000)

Trivial merge