Merge branch 'hCalendar_rename'