also borrowed from  Gabriele Bulfon <gabriele.bulfon at sonicle.com>

Change-Id: I17787fbbf12f1bc8b3e78b8dd2e8b33679bab5b1
Signed-off-by: Michael Stahl <mstahl@redhat.com>