luci-0.9: merge r5027 - r5112