Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Merge branch 'master' of https://github.com/dschreij/OpenSesame