They just released the consolidated package/deal yesterday.
I can't find any reference to it being passed, nor a vote having been held.