Fix unicode issues. More robust handling of None values.
Merge branch 'master' of github.com:philippbosch/django-sirtrevor