Merge back from develop

PSVita has [spoiler]nogaems[/spoiler]