Merged btag-hlt from repository silviodonato