Update documentation.
Fix broken travis-ci configuration.
Merge branch 'master' into coverage