Merge branch 'develop' into features/JAL-1856dbRefFetcherMessages
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Sep 2016 11:39:08 +0000 (12:39 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Sep 2016 11:39:08 +0000 (12:39 +0100)

Trivial merge