Merge branch '2.3' into 2.4

maxctrl/lib/common.js

@@ -144,7 +144,7 @@ module.exports = function() {
             str = str.replace( /\x1B\[[(?);]{0,2}(;?\d)*./g, '')
 
             // Trim trailing whitespace that cli-table generates
-            str = str.split(os.EOL).map(s => s.split('\t').map(s => s.trimEnd()).join('\t')).join(os.EOL)
+            str = str.split(os.EOL).map(s => s.split('\t').map(s => s.trim()).join('\t')).join(os.EOL)
         }
         return str
     }

maxctrl/lib/show.js

@@ -59,7 +59,8 @@ const session_fields = [
     {'Idle': 'attributes.idle'},
     {'Connections': 'attributes.connections[].server'},
     {'Connection IDs': 'attributes.connections[].protocol_diagnostics.connection_id'},
-    {'Queries': 'attributes.queries[].statement'}
+    {'Queries': 'attributes.queries[].statement'},
+    {'Log': 'attributes.log'}
 ]
 
 const filter_fields = [