luci-0.9: merge r5130-r5143