[#31266] GSoC 2013 - Improved Template Manager (Fix #1875)