Fix remaining files.
Merge branch 'master' into travis.yml-test