Merge commit 'refs/pull/197/head' of github.com:intel/tinycbor
diff --git a/.travis.yml b/.travis.yml
index 7ca287d..a935ac9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,11 @@
+env:
+  - BUILD_DOCS=false
+jobs:
+  include:
+    - # only build docs on master
+      if: branch = master
+      env: BUILD_DOCS=true
+
 language: cpp
 matrix:
   include:
@@ -81,4 +89,4 @@
         (cd tests && make TESTARGS=-silent check -k
         TESTRUNNER=`which valgrind 2>/dev/null`)
   - make -s clean
-  - ./scripts/update-docs.sh
+  - ! [ $BUILD_DOCS ] || ./scripts/update-docs.sh