Fixed GetText() failing if no parent existed
Merge remote-tracking branch 'origin/master'