Fix 'File does not exist' on Travis
Merge branch 'master' of git://github.com/ddeboer/data-import