Merge remote-tracking branch 'origin/pr/48'
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 30 Aug 2016 00:32:06 +0000 (10:02 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 30 Aug 2016 00:32:06 +0000 (10:02 +0930)

Trivial merge