Fix bugs related to holidays.
Merge branch 'master' into gh-pages