Merge pull request #1 from morpheby/edx-merge-fixes

Edx merge fixes
Merge branch 'master' into edx-merge-fixes