fixed compilation #952
Merge branch 'bugfixes/tokumx-1.4'