Is one who dies during Hajj considered a martyr?

Dying during Hajj is a sign of a good ending because the Prophet, peace and blessings be upon him, commanded the Companions to shroud a man—whose camel had thrown him while he was in ihram (definition)—in his two garments, without covering his head or anointing him with perfume. He then said: "Indeed, he will be resurrected on the Day of Resurrection, reciting the talbiyah (definition)." This is a great reward, and Hajj is among the best deeds, but there is no evidence that he is a martyr.