simple_one_for_one now does the right thing (TM)
merge bug23958 into default
Merge heads