Merge branch 'have_compression_back'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into fix_state_naming
Basenames should now be correct also when using zipfiles. It is now always only the basename of the file in the zipfile. So if zipname == internalname, its zipname, like requested here: https://github.com/libretro/RetroArch/issues/1030#issuecomment-55810822
if want_miniz is 0, zlib is compiled in regardless. Fixes makefile to allow that.
Now path is also correctly sanitized. g_extern.basename of /path/to/file.zip#game.img is now /path/to/game
Merge pull request #1036 from timostrunk/fix_state_naming

Fix directory and naming of savestates, srm files.