merge edx_master@2014.10.17