compile fix #1032
Merge branch 'bugfixes/tokumx-1.4'