Travis fixes

The patch is no longer needed since it seems to have merged already.
https://core.trac.wordpress.org/ticket/24800