Merge pull request #1101 from ryanjbaxter/master

Fix container implementation for the Playground