Fix a problem in merging from upstream
Fix the LiveTableResultsMacro for template wikis