Merge commit '6797d65989b01c8fa5bdeaf6a66e35279b66a7f7' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:42:01 +0000 (14:42 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:42:01 +0000 (14:42 +0000)

Trivial merge