Update for 2017.02.6

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