Merge pull request #2138 from nsoranzo/release_16.01_fix_for_2135

[16.01] markupsafe.escape() in Python2 does not work on str containing non-ASCII characters

lib/galaxy/web/framework/helpers/grids.py

@@ -2,7 +2,7 @@ import logging
 import math
 
 from galaxy.model.item_attrs import RuntimeException, UsesAnnotations, UsesItemRatings
-from galaxy.util import sanitize_text
+from galaxy.util import sanitize_text, unicodify
 from galaxy.util.json import loads, dumps
 from galaxy.util.odict import odict
 from galaxy.web.framework import decorators
@@ -371,7 +371,7 @@ class GridColumn( object ):
             value = None
         if self.format:
             value = self.format( value )
-        return escape(value)
+        return escape(unicodify(value))
 
     def get_link( self, trans, grid, item ):
         if self.link and self.link( item ):