Merge remote-tracking branch 'origin/master' into myppsspp_unicode
update