Fix for https://bugs.freedesktop.org/show_bug.cgi?id=63755

Had to apply the fix proposed for https://bugs.freedesktop.org/show_bug.cgi?id=63755 to be able to build successfully in Ubuntu Trusty x86_64