luci-0.8: merge r4218 and r4221