Merge travis's fix. Thanks.