luci-0.9: merge r5176-r5182