Handle opaque keys in a backwards-compatible way
Merge pull request #330 from edx/will/opaque-keys

Handle opaque keys in a backwards-compatible way