Merge in of docs from master branch