Cleaned up Search > Templating
Merge remote-tracking branch 'origin/master' into 1.2