Fix @media interpolation errors.

Closes #1260
Merge remote-tracking branch 'origin/stable' into stable