Pull in doc changes from dev into master