Merge branch 'maint'

* maint:
  Encode Erlang source files with non-ascii characters in UTF-8

3 files changed, 112 insertions, 109 deletions

diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 7ff4c81ea6..18ec17a4bf 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -992,7 +993,7 @@ otp_10622(Config) when is_list(Config) ->
           <<0>>),
     check(fun() -> <<"\x{aa}ff"/utf8>> = <<"\x{aa}ff"/utf8>> end,
           "<<\"\\x{aa}ff\"/utf8>> = <<\"\\x{aa}ff\"/utf8>>. ",
-          <<"�\xaaff">>),
+          <<"Â\xaaff">>),
     %% The same bug as last example:
     check(fun() -> case <<"foo"/utf8>> of
                        <<"foo"/utf8>> -> true
diff --git a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
index e0db132c47..b93b907392 100644
--- a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
+++ b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -515,7 +516,7 @@ create_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -523,16 +524,16 @@ create_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -541,19 +542,19 @@ create_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¥:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $þ:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $É:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -562,7 +563,7 @@ create_handle() ->
                              $<:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -570,16 +571,16 @@ create_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -588,22 +589,22 @@ create_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¥:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $::8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¡:8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ñ:8/integer-unit:1-unsigned-big,
                              $Y:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ª:8/integer-unit:1-unsigned-big,
                              $9:8/integer-unit:1-unsigned-big,
                              $\r:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $ý:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -612,51 +613,51 @@ create_handle() ->
                              $I:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
+                             $²:8/integer-unit:1-unsigned-big,
+                             $Í:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
                              $\s:8/integer-unit:1-unsigned-big,
                              $>:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $£:8/integer-unit:1-unsigned-big,
                              $\023:8/integer-unit:1-unsigned-big,
                              $\210:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ç:8/integer-unit:1-unsigned-big,
                              $\232:8/integer-unit:1-unsigned-big,
                              $\226:8/integer-unit:1-unsigned-big,
                              $\223:8/integer-unit:1-unsigned-big,
                              $\237:8/integer-unit:1-unsigned-big,
                              $X:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $\235:8/integer-unit:1-unsigned-big,
                              $l:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¨:8/integer-unit:1-unsigned-big,
                              $g:8/integer-unit:1-unsigned-big,
                              $i:8/integer-unit:1-unsigned-big,
                              $d:8/integer-unit:1-unsigned-big,
                              $\200:8/integer-unit:1-unsigned-big,
                              $\001:8/integer-unit:1-unsigned-big,
                              $R:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
                              $\r:8/integer-unit:1-unsigned-big,
                              $\214:8/integer-unit:1-unsigned-big,
                              $\030:8/integer-unit:1-unsigned-big,
@@ -664,7 +665,7 @@ create_handle() ->
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $c:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\017:8/integer-unit:1-unsigned-big,
                              $=:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
@@ -708,24 +709,24 @@ create_handle() ->
                              $*:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ä:8/integer-unit:1-unsigned-big,
                              $\005:8/integer-unit:1-unsigned-big,
                              $R:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
                              $\031:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
@@ -737,7 +738,7 @@ create_handle() ->
                              $/:8/integer-unit:1-unsigned-big,
                              $\022:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\205:8/integer-unit:1-unsigned-big,
                              $\t:8/integer-unit:1-unsigned-big,
                              $\216:8/integer-unit:1-unsigned-big>>,
@@ -749,33 +750,33 @@ create_handle() ->
                              $j:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $+:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ú:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $·:8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $æ:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $\202:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ô:8/integer-unit:1-unsigned-big,
                              $D:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $®:8/integer-unit:1-unsigned-big,
                              $\034:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
@@ -791,7 +792,7 @@ create_handle() ->
                              $W:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $£:8/integer-unit:1-unsigned-big,
                              $\023:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
@@ -800,18 +801,18 @@ create_handle() ->
                              $\027:8/integer-unit:1-unsigned-big,
                              $\237:8/integer-unit:1-unsigned-big,
                              $\205:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¤:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\007:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¤:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\021:8/integer-unit:1-unsigned-big,
                              $.:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
                              $\224:8/integer-unit:1-unsigned-big,
                              $\217:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $\002:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\203:8/integer-unit:1-unsigned-big,
@@ -1398,7 +1399,7 @@ lookup_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -1406,16 +1407,16 @@ lookup_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -1424,19 +1425,19 @@ lookup_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¦:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
                              $":8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\206:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $Þ:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -1445,7 +1446,7 @@ lookup_handle() ->
                              $.:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
@@ -1453,16 +1454,16 @@ lookup_handle() ->
                              $-:8/integer-unit:1-unsigned-big,
                              $):8/integer-unit:1-unsigned-big,
                              $-:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $È:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ì:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
@@ -1471,19 +1472,19 @@ lookup_handle() ->
                              $\026:8/integer-unit:1-unsigned-big,
                              $%:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¦:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $0:8/integer-unit:1-unsigned-big,
                              $F:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ :8/integer-unit:1-unsigned-big,
+                             $ð:8/integer-unit:1-unsigned-big,
+                             $â:8/integer-unit:1-unsigned-big,
+                             $³:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $ä:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $h:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
@@ -1525,25 +1526,25 @@ lookup_handle() ->
                              $+:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ê:8/integer-unit:1-unsigned-big,
                              $/:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¶:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
+                             $²:8/integer-unit:1-unsigned-big,
+                             $Í:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $e:8/integer-unit:1-unsigned-big,
                              $\211:8/integer-unit:1-unsigned-big,
                              $E:8/integer-unit:1-unsigned-big,
@@ -1555,10 +1556,10 @@ lookup_handle() ->
                              $/:8/integer-unit:1-unsigned-big,
                              $\022:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $×:8/integer-unit:1-unsigned-big,
                              $\227:8/integer-unit:1-unsigned-big,
                              $\t:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big>>,
+                             $Û:8/integer-unit:1-unsigned-big>>,
                            <<$\203:8/integer-unit:1-unsigned-big,
                              $P:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
@@ -1567,33 +1568,33 @@ lookup_handle() ->
                              $\\:8/integer-unit:1-unsigned-big,
                              $x:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ë:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
                              $a:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Î:8/integer-unit:1-unsigned-big,
+                             $Ï:8/integer-unit:1-unsigned-big,
                              $+:8/integer-unit:1-unsigned-big,
                              $N:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $ú:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $ÿ:8/integer-unit:1-unsigned-big,
+                             $û:8/integer-unit:1-unsigned-big,
                              $\f:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $æ:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ö:8/integer-unit:1-unsigned-big,
                              $\222:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ò:8/integer-unit:1-unsigned-big,
                              $\202:8/integer-unit:1-unsigned-big,
                              $\234:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ô:8/integer-unit:1-unsigned-big,
                              $D:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Á:8/integer-unit:1-unsigned-big,
                              $\034:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
                              $\006:8/integer-unit:1-unsigned-big,
@@ -1605,7 +1606,7 @@ lookup_handle() ->
                              $Y:8/integer-unit:1-unsigned-big,
                              $b:8/integer-unit:1-unsigned-big,
                              $Q:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $¢:8/integer-unit:1-unsigned-big,
                              $`:8/integer-unit:1-unsigned-big,
                              $\n:8/integer-unit:1-unsigned-big,
                              $\003:8/integer-unit:1-unsigned-big,
@@ -1616,7 +1617,7 @@ lookup_handle() ->
                              $>:8/integer-unit:1-unsigned-big,
                              $\v:8/integer-unit:1-unsigned-big,
                              $I:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $µ:8/integer-unit:1-unsigned-big,
                              $\020:8/integer-unit:1-unsigned-big,
                              $H:8/integer-unit:1-unsigned-big,
                              $5:8/integer-unit:1-unsigned-big,
@@ -1630,7 +1631,7 @@ lookup_handle() ->
                              $\005:8/integer-unit:1-unsigned-big,
                              $\000:8/integer-unit:1-unsigned-big,
                              $\024:8/integer-unit:1-unsigned-big,
-                             $�:8/integer-unit:1-unsigned-big,
+                             $Ù:8/integer-unit:1-unsigned-big,
                              $\031:8/integer-unit:1-unsigned-big,
                              $M:8/integer-unit:1-unsigned-big>>}
                    end,
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 681c154463..3c49aaa103 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -2820,7 +2821,7 @@ otp_10302(Config) when is_list(Config) ->
     
     "ok.\n** exception error: an error occurred when evaluating"
         " an arithmetic expression\n     in operator  '/'/2\n"
-        "        called as <<\"�\">> / <<\"�\">>.\n" = t({Node,Test7}),
+        "        called as <<\"ª\">> / <<\"ª\">>.\n" = t({Node,Test7}),
     Test8 =
         <<"begin
                A = [1089],