@peter-fogg These changes I made in my last PR. The were merged into master, but somehow also wound up in this PR. My PR is https://github.com/edx/edx-platform/pull/593 .