don't use esc_attr_e as this is for translation, use echo esc_attr instead
Merge branch 'refs/heads/master' into post-select-consistency

Conflicts:
	classes.fields.php