Merge branch 'JAL-1483_29dev' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 9 Jan 2015 11:11:18 +0000 (11:11 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 9 Jan 2015 11:11:18 +0000 (11:11 +0000)

Trivial merge