Merge remote branch 'working/user/shadowspar/ttopac-altcleanup' into template-toolkit...