luci-0.9: merge r5184-r5189