Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Resolved conflicts

Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/backend_info.py
Started multiprocessing edits
Merge remote-tracking branch 'upstream/playground'

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

Conflicts:
	openexp/backend_info.py
Merge remote-tracking branch 'upstream/master'
Bugfix for OSX 32-bit
Fixed flashing display when mouse is visible

Instead of copying the screen surface, the canvas that has been showed
last is buffered. The mouse cursor is then drawn on this buffer, which
is then shown on screen. Not only does this solve the mouse issue, I
think it is also a more time-efficient way of presentation (copying
hw-surfaces takes a lot of time!)
Check if lastShownCanvas exists before using it
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	openexp/_canvas/legacy.py
	openexp/_canvas/xpyriment.py
	openexp/_mouse/legacy.py
	openexp/_mouse/xpyriment.py
correct merge with upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libqtopensesame/qtopensesame.py
	openexp/_canvas/legacy.py
Merge remote-tracking branch 'upstream/master'
Minor fixes to make 2.8.0 work on OSX

Remove locale check
Prevent disabling GUI or keyboard input is no longer registered after
running experiment
Merge branch 'master' into playground