Removed invalid parameters
Merge pull request #3359 from naderchehab/master

Removed invalid parameters
Updated patch version to reflect last merge.
Merge branch 'master' into gh-pages