note about journal branch
Merge branch 'master' into journal