Merged change from mkaz to translate smartquote entities