Develop sync

Syncing up from develop with up-to date doujin-ren