Merge branch 'ready/anarcat/safe_unicode'