luci-0.10: merge r7192 - r7204