Rebase.

Signed-off-by: John Tumminaro <jtumminaro@thought-matrix.com>