Escape double quotes inside property value
Merge remote-tracking branch 'origin/1.6/master' into 1.7/master