Merge pull request #873 from raphink/default_key_options