Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Conflict resolution