Merge pull request #875 from awsiv/master

Fix timekey generation