Minor issue with calendar redirect
Merge branch 'stage'