Treat empty tiles as such rather than solid key trickery.
Merge branch 'master' into carmen-dev