Worked up to v2; it's stable enough to be put in master