Merge branch 'master' into feat/multiple-authors