Signed-off-by: Andrei Stepanov astepano@redhat.com
rebased onto e582e4f8fb0897158416744965653035f013559f
Commit cb450fdb fixes this pull-request
Pull-Request has been merged by astepano
Signed-off-by: Andrei Stepanov astepano@redhat.com