Merge source edx/edx-platform