WIP: Make master 2.6-compatible
This contains all the changes needed to make the master 2.6-compatible. This should not be merged into master!
Be careful: Before merging this, rebase it to keep the history clean.
Edited by Carsten Gräser
This contains all the changes needed to make the master 2.6-compatible. This should not be merged into master!
Be careful: Before merging this, rebase it to keep the history clean.