Merge my master branch

As agreed, the commits are quite atomic and small. More to come.