syntax error #869
Merge branch 'bugfixes/tokumx-1.3'