Fix build with GCC
Merge branch 'maint'

* maint:
  Fix build with GCC