Bug fixed upstream, patch no longer needed (now also update manifest