Moving exception catch from master into xmlrewrite.
Sort term menus by term code

Conflicts:
	README.txt
Fix minor typo in last commit.