Add inline code coverage to Travis
Merge remote-tracking branch 'upstream/master' into defrules