* luci-0.8: merge r3791