Mautic mautic times two for assets path!

Your software
My Mautic version is: 2.8.2
My PHP version is: 5.6.37

Your problem
My problem is:
Assets in themes won’t load as path is wrong. site.dom/mautic/mautic…
If I change the base url and don’t include the mautic after than the email paths aren’t correct but the assets in the themes load. Pick your poison.
For some reason mautic is doubled in the path. I know this was a bug. Did it get fixed and when? How can I download just the fix?

Same problem as here: Subdomain vs Folder?
But no answer was given to this.

These errors are showing in the log:

Steps I have tried to fix the problem: