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

Conflicts:
	app/controllers/api/v1/systems_controller.rb
	engines/bastion/app/assets/bastion/products/new/product-form.controller.js