Merge branch 'develop' into bug/JAL-98consensusMemory
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Oct 2016 09:46:46 +0000 (10:46 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Oct 2016 09:46:46 +0000 (10:46 +0100)

Trivial merge