Merge "Fix bugprone-string-integer-assignment warnings"

    for (size_t i = 0; i < len; ++i) {

        uint8_t val = dist(mt);

        if (val < 10) {

            ret += '0' + val;

            ret += static_cast<char>('0' + val);

        } else if (val < 36) {

            ret += 'A' + (val - 10);

            ret += static_cast<char>('A' + (val - 10));

        } else {

            ret += 'a' + (val - 36);

            ret += static_cast<char>('a' + (val - 36));

        }

    }

    return ret;