Currently https://gerrit.wikimedia.org/r/#/c/275171/ is stuck because of an possibly unclear situation. Current interpretations:

1. The extension is licensed GPL-2.0+ which Tim Starlings contributions additionally licensed with any OSI approved license because Tim's license statement only applies to the code he wrote, not things that other people wrote.
2. The extension is licensed with any OSI approved license since Tim was the original author.

Probably I am making things much too complicated with my patchset, meaning that we should probably go for 1. In this case a new patchset is required.