autotest/autotest — pull request #865 by lmr (2014-08-05 14:44:07+00:00)
Title: Fix travis

Fix problems found on recent Travis jobs.