Various improvements to the multifarm example
Merge branch 'master' into multifarm_paper