71c2789930
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67': Ensure we don't pass null values in to Theme.resolveAttributes