@S gcc-6 @M merge upstream

This commit is contained in:
bebbo
2017-04-26 18:51:04 +02:00
parent 3a69e611b0
commit 0ffab8ccd4