Merge branch 'upstream-sep2019-tcombo' into subtree

diff --cc TWidget.java
index d60efd8d3a321236e2069199c6db2fb364505d69,f11cbf35c62d3aa53d19040343c47a492109d019..ce22330576309206861b8246be3423a248499180
--- 1/TWidget.java
--- 2/src/jexer/TWidget.java
+++ b/TWidget.java
@@@ -1415,17 -1403,17 +1415,31 @@@ public abstract class TWidget implement
       * @return TRUE if the child was removed, FALSE if it was not found
       */
      public boolean removeChild(final TWidget child) {
++<<<<<<< HEAD:TWidget.java
 +        if (children.remove(child)) {
 +                child.close();
 +                child.parent = null;
 +                child.window = null;
 +                
 +                resetTabOrder();
 +                
 +                return true;
 +        }
 +        
 +        return false;
++=======
+       if (children.remove(child)) {
+               child.close();
+               child.parent = null;
+               child.window = null;
+               
+               resetTabOrder();
+               
+               return true;
+       }
+       
+       return false;
++>>>>>>> upstream-sep2019-tcombo:src/jexer/TWidget.java
      }
  
      /**