Merge remote-tracking branch 'tip/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Feb 2017 14:09:26 +0000 (11:09 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Feb 2017 14:09:26 +0000 (11:09 -0300)
To pick fixes that are affecting tests of new 'perf diff' features in
perf/core.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Trivial merge