Fix issue #1839
Fix issue #1789
Merge remote-tracking branch 'origin/select/devel' into select/release

Conflicts:
	conf/locale/ru/LC_MESSAGES/djangojs.po
	conf/locale/ru/LC_MESSAGES/mako.po
	lms/templates/courseware/progress_graph.js