Merge branch 'amordoch-patch-1'

Author: galvisgilberto

plotly/plotly_aux/m2json.m

@@ -25,8 +25,14 @@
         valstr = strrep(valstr, 'Inf', 'null');
         valstr = strrep(valstr, 'NaN', 'null');
     elseif ischar(val)
-         val = checkescape(val); %add escape characters
-         valstr = ['"' val '"'];
+         [r, ~] = size(val);
+         % We can't use checkescape() if we have ['abc'; 'xyz']
+         if r > 1
+             valstr = cell2json(cellstr(val));
+         else
+             val = checkescape(val); %add escape characters
+             valstr = ['"' val '"'];
+         end
     elseif islogical(val)
         if val
             valstr = 'true';