Ok -- what I did instead was merge from this PR to my branch; we'll just make sure this one gets to master first.