Merge Conflict

@commanderhamster
~requested: 120

Worked out merge conflicts