this mirrors the work in: https://pagure.io/greenwave/pull-request/284
Looks good for me.
Pull-Request has been merged by jkaluza
this mirrors the work in: https://pagure.io/greenwave/pull-request/284