diff -Nru wxmaxima-19.07.0/debian/changelog wxmaxima-19.07.0/debian/changelog
--- wxmaxima-19.07.0/debian/changelog	2019-07-06 09:05:52.000000000 +0000
+++ wxmaxima-19.07.0/debian/changelog	2019-07-07 12:18:36.000000000 +0000
@@ -1,8 +1,8 @@
-wxmaxima (19.07.0-27~201907050837~ubuntu18.10.1) cosmic; urgency=low
+wxmaxima (19.07.0-27~201907071203~ubuntu18.10.1) cosmic; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 06 Jul 2019 09:05:52 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sun, 07 Jul 2019 12:18:36 +0000
 
 wxmaxima (19.07.0-1) unstable; urgency=medium
 
diff -Nru wxmaxima-19.07.0/debian/git-build-recipe.manifest wxmaxima-19.07.0/debian/git-build-recipe.manifest
--- wxmaxima-19.07.0/debian/git-build-recipe.manifest	2019-07-06 09:05:52.000000000 +0000
+++ wxmaxima-19.07.0/debian/git-build-recipe.manifest	2019-07-07 12:18:36.000000000 +0000
@@ -1,3 +1,3 @@
-# git-build-recipe format 0.4 deb-version {debupstream}-27~201907050837
-lp:wxmaxima git-commit:9afabf7241f09b95dfc77ca51ee8d034c328558d
+# git-build-recipe format 0.4 deb-version {debupstream}-27~201907071203
+lp:wxmaxima git-commit:4cbecd2a90eaad6733adc186881069b6f79c8a22
 merge packaging lp:wxmaxima git-commit:a78876e04e18f80940f20334c99781bced3c44fe
diff -Nru wxmaxima-19.07.0/src/Autocomplete.cpp wxmaxima-19.07.0/src/Autocomplete.cpp
--- wxmaxima-19.07.0/src/Autocomplete.cpp	2019-07-06 09:05:51.000000000 +0000
+++ wxmaxima-19.07.0/src/Autocomplete.cpp	2019-07-07 12:18:34.000000000 +0000
@@ -129,6 +129,7 @@
   wxString line;
 
   // Add maxima functions
+  m_wordList[command].Add("?derivsimp"); // OPTION
   m_wordList[command].Add("pathname_name"); // FUNCTION
   m_wordList[command].Add("fast_linsolve"); // FUNCTION
   m_wordList[tmplte ].Add("fast_linsolve([<expr_1>, ..., <expr_m>], [<x_1>, ..., <x_n>])"); // OPTION
diff -Nru wxmaxima-19.07.0/src/EditorCell.cpp wxmaxima-19.07.0/src/EditorCell.cpp
--- wxmaxima-19.07.0/src/EditorCell.cpp	2019-07-06 09:05:51.000000000 +0000
+++ wxmaxima-19.07.0/src/EditorCell.cpp	2019-07-07 12:18:34.000000000 +0000
@@ -3477,7 +3477,7 @@
       ++it;
     }
     // Find a keyword that starts at the current position
-    else if ((IsAlpha(Ch)) || (Ch == wxT('\\')))
+    else if (IsAlpha(Ch) || (Ch == '\\') || (Ch == '?'))
     {
       if (token != wxEmptyString)
       {
@@ -3485,7 +3485,14 @@
         token = wxEmptyString;
       }
 
-      while ((it < text.end()) && IsAlphaNum(Ch = *it))
+      if(Ch == '?')
+      {
+        token += Ch;
+        it++;
+        Ch = *it;
+      }
+      
+      while ((it < text.end()) && (IsAlphaNum(Ch = *it)))
       {
         token += Ch;
 
@@ -3850,7 +3857,13 @@
       }
 
       // Text
-      if ((IsAlpha(token[0])) || (token[0] == wxT('\\')))
+      if ((IsAlpha(token[0])) || (token[0] == '\\') ||
+          // '?' might be the 1st letter of a variable name or an help operator
+          // or an non-infix operator of some kind
+          (
+            (token[0] == '?') && (token.Length() > 1)
+            )
+        )
       {
         // Sometimes we can differ between variables and functions by the context.
         // But I assume there cannot be an algorithm that always makes
diff -Nru wxmaxima-19.07.0/test/CMakeLists.txt wxmaxima-19.07.0/test/CMakeLists.txt
--- wxmaxima-19.07.0/test/CMakeLists.txt	2019-07-06 09:05:51.000000000 +0000
+++ wxmaxima-19.07.0/test/CMakeLists.txt	2019-07-07 12:18:34.000000000 +0000
@@ -14,10 +14,13 @@
     add_test(NAME wxmaxima_version_string WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --version)
     set_tests_properties(wxmaxima_version_string PROPERTIES  PASS_REGULAR_EXPRESSION "wxMaxima ${VERSION}.*")
     add_test(NAME wxmaxima_version_returncode WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --version)
-    add_test(NAME wxmaxima_help WORKING_DIRECTORY ${CMAKE_BINARY_DIR}  COMMAND xvfb-run --auto-servernum ./wxmaxima-local --help)
-    # add_test(NAME all_celltypes WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --batch test/testbench_all_celltypes.wxmx)
+    add_test(NAME wxmaxima_help WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --help)
+    add_test(NAME all_celltypes WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --batch test/testbench_all_celltypes.wxmx)
+    set_tests_properties(all_celltypes PROPERTIES TIMEOUT 180)
     add_test(NAME other_features WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --batch test/other-features.wxmx)
+    set_tests_properties(other_features PROPERTIES TIMEOUT 180)
     add_test(NAME misc_problematic_things WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND xvfb-run --auto-servernum ./wxmaxima-local --batch test/misc-problematic-things.wxmx)
+    set_tests_properties(misc_problematic_things PROPERTIES TIMEOUT 180)
 else()
     message(STATUS "xvfb not found => Not enabling the tests.")
 endif()