Merge "Use separate variables as indices in nested loops" into qt-dev