Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Prevent wrong content type for CSS files

Change-Id: Ica84d55e3d86c981d104253293965ff76868677f