Merge pull request #1573 from user7887/lede-17.01