Check uint16_t and uint8_t support correctly

Fixes #177.
Merge branch '2.6'