Release

Merge request from edx:release [20140208]