Fix argument passing
Merge branch 'master' into omnibus_bundling