Font size changes for captions
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	themes/catering/.sass-cache/7f3bbd6423b33a1347a3c4b36560268514f864f1/responsive.desktop.scssc
	themes/catering/css/responsive.desktop.css
Merge remote-tracking branch 'origin/master' into test
#381