MFC r225846, r225853, r225854, r226121, r226320, r226351, r226942, r228991, r229164, r230876, r231274, r231516, r232105, r232353, r234221, r234320, r234446, r234600, r236392, r236733, r238058, r238976, r239498, r240362, r240548, r242549, r242849, r242900, r245447, r247752, r249113

Merge all outstanding calendars commits.

Discussed with:	gjb, des