allow global whitelisting of params
Merge branch 'master' into craftsman-sandbox