fixes #2987
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
fixes #2770