Edx west/release merge

@jrbl