Replaced variable custom_css with custom_head in header.tmpl.php to reduce the confusion.
Merge remote-tracking branch 'upstream/master'