Merge branch 'uint' into maint

* uint:
  Convert to uintXX_t types
Merge branch 'master' into next

* master: