refs 6439 master merged

Conflicts:
	app/views/patrons/_form.html.erb