[pull] master from ngosang:master#1012

pull[bot] merged 2 commits intotoyfun:mastertoyfun/trackerslist:masterfrom

ngosang:masterngosang/trackerslist:masterCopy head branch name to clipboard