should build in travis
Merge pull request #2 from magwas/5.0upstream

builds in travis