Since the branch `revamp-doc-build' is pretty stable now, I am going to rebase it on top of `next'. As the branch has many patches (110), please excuse me in advance for the noise.