Just a @todo note, and added message if no custom attributes are configured for calendars
Merging pull-down from pagoda branch
Block output