Merge "Remove #toc and #toctitle style definitions"