[#31266] GSoC 2013 - Improved Template Manager (Fix #1875)
PHPCS cleanup from template merge
Merge remote-tracking branch 'remotes/upstream/master' into jux-layout-items