Upstream commit 9c065b724ddfa2b78ddf3e2e6671cd30a50b0a66 fixes dtypes
for build against numpy 1.16.  Upstream issue #120.

Closes: #918212, #917670.