Merge pull request #527 from mhaskel/key_compatibility