discussion: update hash
Merge branch 'release' into master

Conflicts:
	requirements/edx/custom.txt