fixup of wrong default value parametrization
Merge branch 'master' into github

* master:
  fixup of wrong default value parametrization