Merge pull request #879 from alblue/calendar-components

Calendar components from:to: date fix