See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.