Improve table's render in calendar
Merge remote-tracking branch 'origin/master' into 3.0-master