Merge pull request #473 from ekaitz-zarraga/fix-luci-failsafe