Merge pull request #952 for calendar widget work