Merge pull request #900 from ccin2p3/faxmodem/cpu-numcpu