Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of https://github.com/isolver/psychopy