Merge branch 'JAL-1459_dnd' into Release_2_8_1_Branch
authorjprocter <<jprocter@dundee.ac.uk>
Thu, 20 Mar 2014 15:54:41 +0000 (15:54 +0000)
committerjprocter <<jprocter@dundee.ac.uk>
Thu, 20 Mar 2014 15:54:41 +0000 (15:54 +0000)

Trivial merge