Fix build with GCC
Merge branch 'maint'

* maint:
  Fix build with GCC
Merge branch 'master' into next

* master:
  Fix build with GCC