Merge origin/master

Conflicts:
	vendor/bin/magazine/public/WYSIWYG/summernote/readme.txt