merge edx_master@2014.11.25