Merge remote-tracking branch 'origin/Madelos2' into Vagos12