Merge branch 'issue3263' into odtesting

Conflicts:
	app/views/works/new_import.html.erb