Merge pull request #1613 from user7887/lede-17.01