Update for 2019.05.2

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