Hopefully will resolve merge conflict for README.rst.