Fixed escaping of quotes.
Merge origin/1.4dev into 1.4dev