Replaced format_html with mark_safe/conditional_escape for Django < 1.5 compatibility.
Merge branch 'feature/no-empty-string-fallback-for-nullable' into develop