Merge branch '2.0' of https://github.com/sourcefabric/Booktype into 2.0