Merge commit 'v2.6.29.1' into zygo-2.6.29.1-zb5s

diff --cc Makefile
index e161d09d11c765a86a7dddf374fad5d88b19aa58,cdb11330cc25292383e5120404b55d5a83e584c4..8981a8b78c56fde847eb5a942aab1bc02f6e5050
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 29
- EXTRAVERSION =
+ EXTRAVERSION = .1
  NAME = Temporary Tasmanian Devil
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README