Add additional fallbacks when self is undefined#521

tqc wants to merge 1 commit intoJakeChampion:masterJakeChampion/fetch:masterfrom

tqc:globaltqc/fetch:globalCopy head branch name to clipboard