am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

* commit 'd6c2ccb25f08447b0358173ff64725d28f207d7b':
  core: fix arithmetic on a pointer to void