Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Fixed conflicts
Merge branch 'master' of https://github.com/dschreij/OpenSesame
Merge remote-tracking branch 'upstream/master'
Merge branch 'origin/playground' into playground

Conflicts:
	openexp/backend_info.py