Merge remote-tracking branch 'upstream/playground' into playground
Merge remote-tracking branch 'upstream/playground' into playground
Merge branch 'playground' of https://github.com/dschreij/OpenSesame into playground