[#11] Fix to ensure template tag definitions are loaded even during admin requests (as a theme's functions.php file will also have loaded at this point)
[#11] Template tag fix: merging with master