tricksy reverse iteration!
Merge branch 'master' into algorithms-reboot