Fix issue #2031
Merge branch 'select/devel' of https://github.com/smartdec/edx-platform into select/devel