Merge remote-tracking branch 'mainline/master' into type-system

Conflicts:
	plugins/turtle_blocks_extras/turtle_blocks_extras.py -- accept all
        incoming changes from mainline/master

1 files changed, 1 insertions, 1 deletions

diff --git a/turtleblocks.py b/turtleblocks.py
index ab5e3db..7af1752 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -556,7 +556,7 @@ Would you like to save before quitting?'))
         filename, self.tw.load_save_folder = get_save_name(
             save_type, self.tw.load_save_folder, 'logosession')
         if isinstance(filename, unicode):
-            filename = filename.encode('ascii', 'replace')
+            filename = filename.encode('utf-8')
         if filename is not None:
             f = file(filename, 'w')
             f.write(logocode)