Update with latest from theme-dev.