merge edx_master@2014.09.15