Need this to get the calendarview to build..
Merge remote-tracking branch 'origin/master'