Merge remote-tracking branch 'upstream/pr/908' * upstream/pr/908: Avoid transforming base C_FLAGS set deliberately
2019-10-07T22:10:14