Fedora 21 support
Merge pull request #6515 from cottsay/fedora-21

Fedora 21 support