calendar mode
.
Merge branch 'master' into nahush
..
a lot