update from edx 20130708