Looks good to me. I'd say merge it once travis passes.