Mitx hotfix rc 20140919

This is to easily keep track of the diff as the the hotfix expands. If any other commits need to be included which aren't here, PR them to mitx-hotfix-rc-20140919.

*NOTE: Do not merge until hotfix is complete.*