luci-0.9: merge r5019 and r5020