Bring the branch up to date and fixed some documentation typos.