Full 2.2 compat
de locale added
query locale patch