Crosslink with Matt's new issue
Alternative P/R provided
Editorial improvements
Merge branch 'master' into refactor_lists_cpp