Forwarding Phil's commit: skipping doctests, conditional skip of unit tests
Merge pull request #483 from pedrovma/spreg18

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