fix fonts when site accessed via SSL
Merge remote-tracking branch 'origin/master' into PROD