Attempt to fix hudson.
Merge pull request #462 from paraiko/master

Attempt to satisfy hudson