misc: merge from pcsxr r91261,r91276