Update docs to meet latest build changes
Merge remote-tracking branch 'upstream/master'