Add missing argument
Merge branch 'master' into next