Updated to latest version of xpi
Merged.