Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/controllers/api/v1/repositories_controller.rb
	engines/bastion/app/assets/bastion/systems/details/views/system-info.html