merge to: 85bafb6da4dddfffa78479aa49a72ae48578a4ce but trunk is broken

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