Trivial NPC logging fix for NCG and QN.
Merge branch 'master' into next
segbuffer: g++ does not like casting int*restrict* to void*, void** okay
Merge branch 'jed/matmatmult-sort' into next

* jed/matmatmult-sort:
  segbuffer: g++ does not like casting int*restrict* to void*, void** okay