Merge 'master' into 'calendar' branch
some small changes