Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 17 Oct 2016 13:38:15 +0000 (14:38 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 17 Oct 2016 13:38:15 +0000 (14:38 +0100)

Trivial merge