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

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