My apologies. I don't think this is a good patch for v1.2. I need to remove one of the commits. I will fix this and resubmit.