build: of course this wouldn't have worked. Now fixing the compiler warning on OS X.
Merge branch 'maint'
Merge branch 'master' into next