luci-0.10: merge r8127 and r8128