Changing number of processes down to 1 so that things go smoother.
Merge remote-tracking branch 'origin/gh-pages' into gh-pages