merge to head of linux-dev

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>