Changing font url to condition loading http and https based on source
Merge remote-tracking branch 'origin/master'