Fixes: DOC-599
Merge pull request #4142 from edx/ahodges/documentation/DOC599

Fixes: DOC-599