set num cores
Merge commit '117c4e3bca2947352019c80845102ad21bb48260' into 2014-11-06-Zurich