Update for 2018.02.7

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 8c9284703c496b913d936689df72d49e095442e4)
[Peter: drop Makefile changes]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
1 file changed