luci-0.8: Merge r4467, r4468