luci-0.9: merge r5730 amd r5731