merge 4be2ca3ed8be8e48795f351bb47ad51c9ca1a555 from head, docs update
9 files changed