Merge remote-tracking branch 'origin/b24' into b24

# Conflicts:
#	config/autoload/unicaen-vue.global.php