squashing in preparation for PR submission
Merge branch 'trbm/hints' of https://github.com/edx/edx-platform into upstream/trbm/hints