compilation fix #1180
Merge branch 'bugfixes/tokumx-1.5'