[pull] master from hrydgard:master#598

pull[bot] merged 2 commits into

Alexandre1er:masterAlexandre1er/ppsspp:masterfrom

hrydgard:masterhrydgard/ppsspp:masterCopy head branch name to clipboard