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