- Add a lock function for parameters
Merge branch 'master' into local11
 - Work on min distance criterion for FilterObjects.cpp.