Merge branch '3.1-maint' into 3.2-maint

* 3.1-maint:
  Spelling fix

diff --cc test.sh
index b511146c797fd359580d78d6b1933582a9d0abf8,d0cc531f3b62c2c130cad6c5ccfb976b2fe69d9a..e473857de29522f66356dfffd87b73786d9701c9
--- 1/test.sh
--- 2/test.sh
+++ b/test.sh
@@@ -236,13 -217,10 +236,13 @@@ base_tests() 
  
      testname="CCACHE_DISABLE"
      mv $CCACHE_DIR $CCACHE_DIR.saved
 +    saved_config_path=$CCACHE_CONFIGPATH
 +    unset CCACHE_CONFIGPATH
      CCACHE_DISABLE=1 $CCACHE_COMPILE -c test1.c 2> /dev/null
      if [ -d $CCACHE_DIR ]; then
-         test_failed "$CCACHE_DIR created dispite CCACHE_DISABLE being set"
+         test_failed "$CCACHE_DIR created despite CCACHE_DISABLE being set"
      fi
 +    CCACHE_CONFIGPATH=$saved_config_path
      mv $CCACHE_DIR.saved $CCACHE_DIR
      checkstat 'cache hit (preprocessed)' 3
      $CCACHE_COMPILE -c test1.c