Added /SDL-1.2.15 to .gitignore
Merge remote-tracking branch 'remotes/origin/master' into tests-native