Merged branch Redsandro-docsRenderMixed and resolved conflicts