Propagator cleanup
Merge branch 'master' of github.com:nicholas-leonard/dp