luci-0.9: merge r5693 and r5697