Merge branch 'remove-difforder-completely' into 'master'

Andreas Dednerrequested to merge
cherry-pick-bf4db820 into releases/2.6

Remove the diffOrder parameter completely

See merge request !63 (merged)

(cherry picked from commit bf4db820)

57e59a66 Remove the diffOrder parameter completely

Merge request reports