Active trail always set to homepage on multilingual setup

Steps te reproduce

Have at least 2 languages setup with a path prefix in the language detection and 2 different menu's rendered on the page.

Create a homepage in both languages and add the homepage as menu item to menu 1.
Create a second page in a language and add it to menu 2.

The active trail in menu 1 is set to the homepage, which is incorrect.
The active trail in menu 2 is set to the current page, which is correct.

Attached is a patch that filters out the language prefix from the path_elements array. As that is the cause of this behaviour. As far as I understand the modules logic, any possible language prefix should not be in the path_elements array as it just confuses the active trail calculation.

With this patch I still have the issue that the active trail for the homepage now doesn't work anymore... Not sure how to fix that.