Merge branch 'issue536' into 1.7.x
rename configuration flag to parallelProcessing
fix merge conflicts