Kittens!
Merge branch 'master' into ui-mockups