TemplateParser: added detection of xsl:choose elements that act like a hash table
Merge branch 'master' into QUICK