Synchronisation With Master, 1.0 branch (2018.09.20.)

Tried to go through the differences between the current heads of the 1.0 and master branches (with diff -ur), and cherry-pick updates from the master branch that should be in 1.0 as well.

Some of them I could cherry-pick as they were, for some I had to resolve some conflicts, and one update I simply just implemented for 1.0 in a new commit.

P.S. Even after this, the list of differences between the two branches is quite staggering...