Fix issue 1819
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release