Sync with 7THStage:idigdoge master