Merge branch 'mbland-heartbeat-test'
authorBen Laurie <ben@links.org>
Mon, 19 May 2014 16:40:52 +0000 (17:40 +0100)
committerBen Laurie <ben@links.org>
Mon, 19 May 2014 16:40:52 +0000 (17:40 +0100)

Trivial merge