merge in brentp's interleave branch