Merge pull request #1590 from user7887/lede-17.01