Fix travis failures from merge of #9566