First Full Release changes to template.php based on issue 1334344-9
Beta release. No changes from Dev1.
changes to template.php based on issue 1334344-9