notice for vacation
Merge branch 'master' into develop