More edits.
Merge branch 'master' into aboyoun-coxph