Merge branch 'master' into function_fitting
Add a test to make sure changing the number of parameters filters up to parent operator
Merge branch 'function_fitting'