Updated! And honestly, as the OP, I feel they might not put it in 2.1 and might have a patch between 2.1 and 2.2 at best. I guess it's better than waiting 5-6 more months after 2.1.. but still. :/