Merge branch 'rc-20140825' into release
Revert "make course listsings (front page) opaque keys compliant"

This reverts commit e412f55f0e6eae5a5ef6a444066fc1b0c8177a2b.