Merge pull request #1037 from clebertsuconic/master

https://bugzilla.redhat.com/show_bug.cgi?id=959516