Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

.travis.yml

@@ -30,6 +30,7 @@ env:
     - TESTSUITE_URL=http://127.0.0.1:8000
 
 install:
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then source ~/virtualenv/python3.6/bin/activate ; fi
   - ./test/ci-install-$CI_MODE
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then case "$TRAVIS_PHP_VERSION" in hhvm*) ;; *) phpenv config-add test/php-noprofile.ini ;; esac ; fi
 

test/ci-install-docs

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-# We use 1.5 to be able to deal with gzip only sites in linkcheck (such as tcpdf.org)
+# Install deps for building documentation
 
-pip install --user 'Sphinx' 'requests[security]'
+pip install 'Sphinx'