Final text review
Merge pull request #5914 from edx/renzo/final-text-review

Final text review