merge edx/master