Upstream master

Fancy quotes fixed.