Fix bug where we weren't showing the proper date on the Calendar
Merge remote-tracking branch 'origin/master'