otherwise +1 for merge once travis is happy