luci-0.9: merge r5154-r5161