Merge branch 'staging' into 641-git_mv_handling

Conflicts:
	Gemfile.lock
	app/models/ontology_version.rb