[Rebase] rebase merged request
Got some troubles with DrhagisUpdates branch when trying to fix all the conflicts, this branch is for the same purpose.
Got some troubles with DrhagisUpdates branch when trying to fix all the conflicts, this branch is for the same purpose.