Merge pull request #1827 from Ansuel/luci-map