sync: master to alpha#666

edx-requirements-bot merged 2 commits intoalphaopenedx/frontend-build:alphafrom

masteropenedx/frontend-build:masterCopy head branch name to clipboard