Hi,
Please review and merge into stable and devel. Bonus points for also
merging it into feature/jessie, and then:
git revert 430709a8efad146d30980a2e3377a4e00be3e995
and adding something like "This was a Wheezy-specific workaround" to the
revert's commit message.
Cheers!