Who choreographed the lightsaber battles in the Star Wars movies?

I heard that there is some famous fencing afficianato who was the main choreographer for the lightsaber battles in Star Wars, the swordfights in Pirates of the Caribbean, and a couple other movies like The Mask of Zorro.
Does anybody know what that guys name is?