luci-0.10: merge r7934 - r7959