We now use the correct number of processors.
Merge remote-tracking branch 'upstream/sr' into sr2