Merge commit 'v2.6.31.14' into zygo-2.6.31.14-zb5s

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