Merge commit 'v2.6.31.13' into zygo-2.6.31.13-zb5s

diff --cc Makefile
index d92209a41f3680fa04c1d3fa550e5f56b59ff705,ac8ee8ed30ab352418529368931b67224d251559..024734794dbe785fc73dce9364845d32ed6d355d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .12
+ EXTRAVERSION = .13
  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