Merge pull request #896 for calendar bug fix