Bringing things up to date.

Merge a lot of changes from upstream (most of 2016 and 2017). Going further requires a newer gcc.
Probably some regressions, little testing was done so far. But also quite a lot of problems fixed.