merge edx/edx-platform