Stanford bad merge tag fix
Merge pull request #1632 from edx/jrbl/edx-west/hotfix-badmergetags

Stanford bad merge tag fix