Merge branch 'develop' into bug/JAL-98consensusMemory
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Sep 2016 13:23:46 +0000 (14:23 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Sep 2016 13:23:46 +0000 (14:23 +0100)

Trivial merge