Merge remote-tracking branch 'origin/pr/45'
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 23 Aug 2016 03:33:10 +0000 (13:03 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 23 Aug 2016 03:33:10 +0000 (13:03 +0930)
Closes: 45

Trivial merge