Merge missing shared changes from GPL 3677
Merge branch 'master' of https://github.com/RMerl/asuswrt-merlin