Updates from internal changes, thru Jan 6#47

mjang merged 2 commits intomainnginx/documentation:mainfrom

updates-thru-jan6nginx/documentation:updates-thru-jan6Copy head branch name to clipboard