Fixed  &lt;&gt; in error message
Merge branch 'auth_field_clobbering_filter' into bryan_working