Merge remote-tracking branch 'dechamps/sleep' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000 (22:33 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000 (22:33 +0100)

Trivial merge