Ready to Upstream?

[Chocrates]

@froi @zkoppert @jasonmacgowan
This appears to be working now that Froi got the merge fixed for us. Are we ready to attempt to upstream this?

[froi]

I seem to remember we decided not to upstream. @Chocrates and @zkoppert am I correct? Something to do with upstream not accepting PRs?

[Chocrates]

Its broken right now so I closed the PR. I thought we were going to try to get it upstream and if they pushed back we weren't going to push.