WIP: main changes from dev #2

Closed
_N0x wants to merge 12 commits from dev into master
Showing only changes of commit d71af63d2b - Show all commits

Binary file not shown.