Import an upstream commit to make sure some definitions passed via -D to the compiler are quoted correctly.
