fix compilation #512
Merge branch 'bugs/512' into releases/tokumx-1.2