Merge branch 'run2-python3' into 'run2-patches'

Stable iteration order for Python 2/3

See merge request !301

(cherry picked from commit e43fa8bc)

63eb76a8 Stable iteration order for Python 2/3
2b62cebb Fixed formatting
2 jobs for cherry-pick-e43fa8bc in 58 seconds