I committed this already.  It RAN, didn't it?!  grr.
Merge branch 'parallel' into janus