refs #678, address CR comment
Merge branch 'bugfixes/tokumx-1.3'