Merge pull request #1152 from public/fedora20-ec-fix

Fix EC issue on Fedora 20