Merge branch 'sg/travis-cocci-diagnose-failure'