Merge remote-tracking branch 'origin/wip/meson'
authorMike Gorse <mgorse@linux-e5s4.suse>
Tue, 20 Jun 2017 02:53:57 +0000 (21:53 -0500)
committerMike Gorse <mgorse@linux-e5s4.suse>
Tue, 20 Jun 2017 02:53:57 +0000 (21:53 -0500)

Trivial merge