Merge branch 'v2/master' Conflicts: doc/rteval.8 rteval.spec rteval/cyclictest.py rteval/hackbench.py rteval/rteval.conf rteval/rteval.py setup.py Signed-off-by: Clark Williams <williams@redhat.com>