changed data types to avoid -Wtype-limits #655
Merge branch 'bugfixes/tokumx-1.3' into releases/tokumx-1.3