* luci-0.8: merge further changes