Merge branch 'master' into next

libs/dll-binaries/i686/libgme.dll

libs/dll-binaries/x86_64/libgme.dll

libs/gme/CMakeLists.txt

libs/gme/changes.txt

libs/gme/demo/basics.c

libs/gme/demo/cpp_basics.cpp

libs/gme/gme.txt

libs/gme/gme/CMakeLists.txt

libs/gme/gme/Data_Reader.cpp

libs/gme/gme/Data_Reader.h

libs/gme/gme/Music_Emu.cpp

libs/gme/gme/Music_Emu.h

libs/gme/gme/Nsfe_Emu.cpp

libs/gme/gme/Spc_Cpu.cpp

libs/gme/gme/Spc_Cpu.h

libs/gme/gme/blargg_source.h

libs/gme/gme/gme.cpp

libs/gme/gme/gme.h

libs/gme/gme/libgme.pc.in

libs/gme/include/gme/gme.h