Sync with fork

Here's some work to update with travis ci, and sync a patch from trunk