Aspen release - Merge additional commits since RC

Adds commits added to the aspen branch since the RC was originally published: https://github.com/edx/edx-platform/commits/openedx/rc/aspen-2014-09-10