WIP: Make master 2.6-compatible

Carsten Gräserrequested to merge
feature/make-2.6-compatible into master

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

Merge request reports