Merge pull request #12856 from edx/douglashall/merge_patch_2016_06_22_to_master

common/djangoapps/student/forms.py

common/djangoapps/student/tests/test_email.py

common/djangoapps/student/tests/test_reset_password.py

common/djangoapps/student/views.py

common/lib/xmodule/xmodule/css/video/display.scss

...on/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html

common/lib/xmodule/xmodule/js/karma_xmodule.conf.js

common/lib/xmodule/xmodule/js/spec/main_requirejs.js

...n/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js

...xmodule/xmodule/js/spec/video/video_speed_control_spec.js

...ib/xmodule/xmodule/js/src/video/08_video_speed_control.js

common/lib/xmodule/xmodule/js/src/video/09_video_caption.js

lms/djangoapps/bulk_email/tasks.py

lms/templates/emails/activation_email.txt

lms/templates/emails/activation_email_subject.txt

lms/templates/emails/confirm_email_change.txt

lms/templates/emails/email_change.txt

lms/templates/emails/email_change_subject.txt

openedx/core/djangoapps/credit/email_utils.py

openedx/core/djangoapps/user_api/accounts/api.py