More holiday changes
Merge branch 'dev'
More holiday changes