[pull] master from ngosang:master#827

pull[bot] merged 2 commits intoarlessweschler:masterarlessweschler/trackerslist1:masterfrom

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