first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it