Fixing integration of containers into the Playground.
Merge remote-tracking branch 'Upstream/master'
Merge pull request #1101 from ryanjbaxter/master

Fix container implementation for the Playground