Cludge to work with current state of develop. Refs #970
Merge branch 'feature/970_python_fitfunctions' into develop