Fix build warning/failure in fedora 22 rawhide v2

Hopefully, the commit messages say it all, now includes sign-off.