Fixed bug where unicode strings passed to urllib.quote_plus would choke with special characters
Merge remote-tracking branch 'origin/russian-doll' into russian-doll