refs #1178, add comments
Merge branch 'bugfixes/tokumx-1.5'