Commit 7a293bd0 authored by javi's avatar javi

Merge branch 'collectoins_options'

Conflicts:
	CHANGELOG
	README.md
parents 5422ae83 f75fa1f4
Pipeline #8692 passed with stage
in 6 seconds