Apply Fix from Pull # 1193 to edX Master