Merge branch 'master' into next

objs/DC/SDL/Debug/.gitignore

objs/DC/SDL/Release/.gitignore

objs/Linux/SDL/Debug/.gitignore

objs/Linux/SDL/Release/.gitignore

objs/Linux64/SDL/Debug/.gitignore

objs/Linux64/SDL/Release/.gitignore

objs/Mingw/Debug/.gitignore

objs/Mingw/Release/.gitignore

objs/Mingw/SDL/Debug/.gitignore

objs/Mingw/SDL/Release/.gitignore

objs/Mingw64/Debug/.gitignore

objs/Mingw64/Release/.gitignore

objs/Mingw64/SDL/Debug/.gitignore

objs/Mingw64/SDL/Release/.gitignore

objs/PS3/SDL/Debug/.gitignore

objs/PS3/SDL/Release/.gitignore

objs/PSP/SDL/Release/.gitignore

objs/SDL/Release/.gitignore

objs/VC/.gitignore

objs/VC9/.gitignore