Minor changes in docs.
Multiple references
Manual merge
Manual merge