Merge branch 'no-kick'
Merge branch 'master' into no-kick