A local branch created as Lee requested these two patches were applied in a fashion that would later let him merge the same branch into MFD if needed.
