merge edx:Release@2014.9.23