Fix samples so they work in the playground
Merge remote-tracking branch 'origin/master'