--- a/.hgtags	Sat Dec 12 06:55:40 2015 +0100
+++ b/.hgtags	Tue Dec 22 09:21:58 2015 +0100
@@ -15,11 +15,13 @@
 21319eb4135fdc2573a000047bca32ac7d99ff15 expecco_2_0_0
 21319eb4135fdc2573a000047bca32ac7d99ff15 expecco_2_0_0_0
 28bccabea00a97d561d12f6fcb53293d71521678 expecco_2_5_1
-295e6d594ca07ba5bfd523c99eb54f9bb675239e expecco_ALM_1_9_5
+2c3d25b893b5bd0bd5c497010c0e6ebf18d95312 expecco_2_8_0
 344ba7f9a4ef81e37d2b56d0fd82b041135c5299 expecco_2_5_0
 3cb176c752a62ce05b539c8826c17e4991e964d4 expecco_1_7_2rc1
 41eb0d5fe61803e50881a137a9f7c62572d61d1c expecco_1_6_0rc5
 442b9763111cbc47e9d3e63ba5757f9b45cbb2a3 rel3_4_3_1
+4457c3a56d8d84af48903d3864667811059e1908 expecco_ALM_1_9_5
+4457c3a56d8d84af48903d3864667811059e1908 expecco_ALM_1_9_6
 4c4246ecbeb5f9f58e56b44ae6744531c55c2357 expecco_2_7_5
 4c4246ecbeb5f9f58e56b44ae6744531c55c2357 expecco_2_7_5a
 4f874d66dbdeb98264f478fde031b4544cfeeaf7 expecco_1_8_0rc1

--- a/StandardSystemView.st	Sat Dec 12 06:55:40 2015 +0100
+++ b/StandardSystemView.st	Tue Dec 22 09:21:58 2015 +0100
@@ -1605,9 +1605,10 @@
         iconValue := icon value.
         icn := dev convertedIcon:iconValue.
         (icnMask := iconValue mask) notNil ifTrue:[
-            icnMask := dev convertedIconMask:icnMask
+            icnMask := dev convertedIconMask:icnMask.
         ].
-        deviceIcon := icn.
+        "this is to keep the references"
+        deviceIcon := Array with:icn with:icnMask.
     ].
 
     "/ give global eventListeners a chance to intercept windowCreation

--- a/WindowSensor.st	Sat Dec 12 06:55:40 2015 +0100
+++ b/WindowSensor.st	Tue Dec 22 09:21:58 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
               All Rights Reserved
@@ -2502,11 +2500,10 @@
 !WindowSensor methodsFor:'event simulation'!
 
 enqueueMessage:selector for:someone arguments:argList
-    "/
-    "/ if such a message is already in the queue, ignore it.
-    "/ Otherwise push it as an event, to be handled when my thread is
-    "/ back in the event loop.
-    "/
+    "if such a message is already in the queue, ignore it.
+     Otherwise push it as an event, to be handled when my thread is
+     back in the event loop."
+     
     self criticalUserEventQueueAccess:[
         (self hasUserEvent:selector for:someone withArguments:argList) ifFalse:[
             self pushUserEvent:selector for:someone withArguments:argList

--- a/XWorkstation.st	Sat Dec 12 06:55:40 2015 +0100
+++ b/XWorkstation.st	Tue Dec 22 09:21:58 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -7650,7 +7648,7 @@
 	    ).
 
       Screen current
-	heightOf:'hello World gggÖÜ' from:1 to:15
+	heightOf:'hello World ggg' from:1 to:15
 	inFont:(Screen current getDefaultFontWithEncoding:#'iso10646-1')
     "
 !