Merge commit '8a1cae77d279cc246a68109f6178b2bb05e7471f'

diff --combined src/jexer/TWidget.java
index ce22330576309206861b8246be3423a248499180,d60efd8d3a321236e2069199c6db2fb364505d69..d60efd8d3a321236e2069199c6db2fb364505d69
--- 1/src/jexer/TWidget.java
--- 2/TWidget.java
+++ b/src/jexer/TWidget.java
@@@ -1415,7 -1415,6 +1415,6 @@@ 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;
@@@ -1427,19 -1426,6 +1426,6 @@@
          }
          
          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
      }
  
      /**