Merge remote-tracking branch 'upstream/master' into upstream

diff --cc config.guess
index c38553dc74bb4f06a43f734903d1e1c0f1ed6fdb,b79252d6b1034cbcce18ed21d4ed21a405f987e9..b79252d6b1034cbcce18ed21d4ed21a405f987e9
mode 100644,100755..100644
--- 1/config.guess
--- 2/config.guess
+++ b/config.guess

diff --cc config.sub
index ad9f39571183b5c22b2d269bb52eb9ad50227430,61cb4bc22db8e0a490b5ea5bffe6575c10ff92e0..61cb4bc22db8e0a490b5ea5bffe6575c10ff92e0
mode 100644,100755..100644
--- 1/config.sub
--- 2/config.sub
+++ b/config.sub