Merge commit 'v2.6.30.4' into zygo-2.6.30.4-zb5s

diff --cc Makefile
index c941aa7b1de0a50d226433e3a57a1143fdac4be7,722294a682bfb1affd30ac10084684e0e47c8464..b270005013a9a38b1789207a55f89dd53f0a210f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 30
- EXTRAVERSION =
+ EXTRAVERSION = .4
  NAME = Man-Eating Seals of Antiquity
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README