Squashing to create patch

Signed-off-by: Joseph P. Hall III <jhall68@bloomberg.net>