luci-0.8: merge r4515-r4518