+1 for merge.

I'll let you click the green button and fix the buildbot asap if needed :)

btw tests pass on my box