Merge pull request #356 from EricWittmann/master

Fix for:  https://bugzilla.redhat.com/show_bug.cgi?id=1028044