Bug fix and allow packages to build on Debian 8.
This will create a new commit in order to revert the existing changes.
