Merge changes into eel
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Wed, 27 Dec 2017 13:35:30 +0000 (13:35 +0000)
committerGerrit Code Review <gerrit@automotivelinux.org>
Wed, 27 Dec 2017 13:35:30 +0000 (13:35 +0000)

Trivial merge