Merge branch 'JAL-1483_29dev' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 8 Jan 2015 14:48:33 +0000 (14:48 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 8 Jan 2015 14:48:33 +0000 (14:48 +0000)

Trivial merge