If LDAP templates are not Unicode, bad things happen
Merge branch 'master' of github.com:aspc/mainsite