no need to repeat "the whole year"
Merge branch 'master' into live