Merge "Fix pointer arithmetic on a void*"