Merged master to rc/2013-11-21, so we can merge it back to master.#1802

nedbat merged 7 commits into

masteropenedx/openedx-platform:masterfrom

ned/merge-master-to-rc-2013-11-21-againopenedx/openedx-platform:ned/merge-master-to-rc-2013-11-21-againCopy head branch name to clipboard