merge edx_master@2014.12.04