Merge branch 'malahal-patches-from-ganltc' into next

Signed-off-by: Frank S. Filz <ffilzlnx@mindspring.com>