Matching travis changes from flixel repo