s://github.com/WebTales/rubedo into next

Conflicts:
module/Rubedo/config/services.config.php