Merge pull request #7042 from stangri/master-luci.mk