Merge commit 'v2.6.31.7' into zygo-2.6.31.7-zb5u

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