Updates per std-proposals mailing list feedback
Merge branch 'master' into gh-pages