fix #13386
Merge branch 'master' into fix-13386

Conflicts:
	js/carousel.js
Merge branch 'fix-13386'