Merge pull request #5094 from wigyori/for-15.05-pianod
authorZoltan Herpai <wigyori@uid0.hu>
Mon, 13 Nov 2017 06:20:47 +0000 (07:20 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2017 06:20:47 +0000 (07:20 +0100)
CC: fix pianod build

Trivial merge