Removed table from context, added concat to template.
Merge remote-tracking branch 'origin/master'