luci-0.10: merge r6791, r6792 and r6793