Restoring correct version of cov and var that were messed up with the parallel branch
Merge branch 'master' into parallel
Restore parallel cov after merge
Restoring parallel var