Forwarding Phil's commit: skipping doctests, conditional skip of unit tests