Stable iteration order for Python 2/3

Marco Cattaneorequested to merge
cherry-pick-e43fa8bc into master

Goes with !307 (merged)

See merge request !301 (merged) (cherry picked from commit e43fa8bc)

Edited by Marco Cattaneo

Merge request reports