Fore Unix-style line endings
Bugfix for OSX 32-bit
Add a workaround for older versions of PyQt4
Merge remote-tracking branch 'upstream/master'