@S gcc-6: merge upstream

This commit is contained in:
bebbo
2017-03-14 21:45:20 +01:00
parent 92c0de2934
commit af8c14fd7d