merge edx_master@2014.9.23