Merge branch 'feature/markchang/500-copy-change' of github.com:edx/mitx into feature/markchang/500-copy-change