child theme fix, hopefully.
Merge origin/master