Merge "Fix escaping of characters" into froyo