-
Jonny Bradley authored
Manually merged conflicts from r30691 on 6.x and r30308 on trunk (N.B. Steer clear of modifying parse_first() in 6.x any more if possible)
60fea908
Manually merged conflicts from r30691 on 6.x and r30308 on trunk (N.B. Steer clear of modifying parse_first() in 6.x any more if possible)