Merge "fix -Wunreachable-code-loop-increment" am: 33fe26ea

mentioned in commit e2b1b8ae

mentioned in commit cc730ec4

mentioned in commit 2c6d1092

mentioned in commit 526dbaec

mentioned in commit 38c4d169

mentioned in commit 374bfacb

mentioned in commit 76f69d48

mentioned in commit 28937b4a

mentioned in commit 7f6fdbfb

mentioned in commit 0ced85ab

mentioned in commit f281611d