#1146 merge strategy ours to allow develop different travis configuration