Made the Hashini Senaratne patch work with the latest (2.1 master) LyX.