Get rid of cobertura in travis config.
Merge remote-tracking branch 'origin/master'