* luci-0.8: merge r3724, r3725