Version sent by Jorge.
Merge branch 'test_degrees_freedom' with -s ours in order to delete it.
Updated doc for the new, no-call std_dev.