Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 23 Aug 2016 18:35:47 +0000 (15:35 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 23 Aug 2016 18:35:47 +0000 (15:35 -0300)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Trivial merge