Further updates per std-proposals list feedback
Merge branch 'master' into gh-pages