The new version includes all previously locally backported patches. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 669e4a9542)
669e4a9542