Merge branch 'Release_2_8_2b1_Branch' Release_2_8_2b1
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:45:30 +0000 (14:45 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:45:30 +0000 (14:45 +0000)

Trivial merge