Merge branch 'JAL-1602_282_release' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 1 Dec 2014 23:56:13 +0000 (23:56 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 1 Dec 2014 23:56:13 +0000 (23:56 +0000)

Trivial merge