Merge branch 'master' into coverity_scan

diff --cc .gitattributes
index 6212bd4,6212bd4..9eb12c0
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -19,3 -19,3 +19,6 @@@
  # Windows
  *.bat text eol=crlf
  *.cmd text eol=crlf
++
++# .travis.yml merging
++.travis.yml merge=ours