diff --git a/README.rst b/README.rst
index 617af8deb2f982b39bd3980d60b9ee7394ce8d7c..6c6bed231907c75acc0089651da69b84d6ac9cb6 100644
--- a/README.rst
+++ b/README.rst
@@ -141,6 +141,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Change history
 --------------
 
+Version 2.29.13 (05/08/2018)
+
+- Merged PR from Andrei Fokau.  Fix tests by striping varying lines.
+  Also add config for Travis CI.  Thanks to Andrei for this
+  enhancement.
+
 Version 2.29.12 (04/23/2018)
 
 - Patch to compute the fully qualified name of the simple types
diff --git a/generateDS.py b/generateDS.py
index 38a9753cf1ccb5bbd7af7666a2ef5ce9a0b56676..bdc31de254ebdad4a90c797a129ce9a9f72e3ea9 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -232,7 +232,7 @@ logging.disable(logging.INFO)
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.29.11'
+VERSION = '2.29.13'
 ##VERSION##
 
 BaseStrTypes = six.string_types
diff --git a/generateDS.txt b/generateDS.txt
index e9c12dd4f1c0a20f56b780739a590be4719120b0..c0a5ce128199d1f0464a4f8131dcdcad12b711c5 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
 
 .. version
 
-:revision: 2.29.11
+:revision: 2.29.13
 
 .. version
 
diff --git a/generateds_gui_notes.txt b/generateds_gui_notes.txt
index 0cd90f10e6f081d444164b1fb78d1a50c330942a..ef76705a3a82ee9a7db5bf7c76b41d64e26a0a57 100644
--- a/generateds_gui_notes.txt
+++ b/generateds_gui_notes.txt
@@ -12,7 +12,7 @@ GenerateDS GUI Notes
 
 .. version
 
-:revision: 2.29.11
+:revision: 2.29.13
 
 .. version
 
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index 9193a249496707d992db0c4a77d7ff6bd8b2dcf6..9242105fce889230dccd8f54dbc2fd95ceb275cb 100644
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.29.11'
+VERSION = '2.29.13'
 ##VERSION##
 
 
diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt
index a726e0e7cd246abf553684ab0d55570d32030850..e146266811360b666f567fd234ac0538fa1eed5a 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
 
 .. version
 
-:revision: 2.29.11
+:revision: 2.29.13
 
 .. version
 
diff --git a/process_includes.py b/process_includes.py
index f7ffb58199b0ff1028fb183b81068d8955e96ecd..6bafd8718498b7d13fcbee71bb80c63bf6644cc3 100755
--- a/process_includes.py
+++ b/process_includes.py
@@ -40,7 +40,7 @@ except ImportError:
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.29.11'
+VERSION = '2.29.13'
 ##VERSION##
 
 CatalogDict = {}
diff --git a/setup.py b/setup.py
index 4e915666f05d091a76d3ad1d03477a36466394cf..3375ec3bd2fc8c8f0ea8546846f7dad30e96b91a 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ setup(name="generateDS",
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-    version="2.29.11",
+    version="2.29.13",
 ##VERSION##
     author="Dave Kuhlman",
     author_email="dkuhlman@davekuhlman.org",
diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt
index 421804363af912a48854fe99d3c4828e42a67eaf..ff7059c36fa81f7ca230c86764ffaa143b86a932 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
 
 .. version
 
-:revision: 2.29.11
+:revision: 2.29.13
 
 .. version