Merge branch 'master' into master

Author: Marian Zvada

bin/stashcp2/tests/build_docs.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -xe
 
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ! -z ${encrypted_e92dfea3fdc7_key+x} ]; then
 
   openssl aes-256-cbc -K $encrypted_e92dfea3fdc7_key -iv $encrypted_e92dfea3fdc7_iv -in deploy-key.enc -out deploy-key -d
   chmod 600 deploy-key