Merge branch 'openedx/rc/aspen-2014-09-10' into aspen-merge