luci-0.11: merge r9560