Merge pull request #1689 from fhartwig/master

Fix small documentation error
Comment.
.travis.yml: use travis-retry to work around connectivity issues.

See http://blog.travis-ci.com/2013-05-20-network-timeouts-build-retries/
. Thanks to Mateusz Kowalczyk for the tip.