Applying 2 patches from Ubuntu Trusty packaging of this version.