Rebase against edx/master