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

Conflicts:
	engines/bastion/app/assets/bastion/systems/details/views/system-info.html