Merge my master branch

As agreed, the commits are quite atomic and small. More to come.
Not in this particular case, but in general yes. Anyways, I won't bother so much about these anymore.