Fix for BLD-993

**PR for master**

[3354](https://github.com/edx/edx-platform/pull/3354)

**Description**

@adampalay wants to ship this with current release (2014-04-16).

**Jira issue**

[BLD-993](https://edx-wiki.atlassian.net/browse/BLD-993)

**Reviewers**

- @adampalay 
- @dianakhuang 
- @davestgermain