Merging document fixes by @davidhemphill