Delete unused parameter.
Merge branch 'master' into Viktor